# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1046.15.41 -> 1.1046.15.42
#	drivers/input/serio/i8042-io.h	1.4     -> 1.5    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/05/30	mochel@osdl.org	1.1046.194.1
# Merge bk://ldm.bkbits.net/linux-2.5-core
# into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-core
# --------------------------------------------
# 03/05/30	dougg@torque.net	1.1046.195.1
# [PATCH] sg driver for lk 2.5.70
# 
# This is a bug fix for a flawed patch I put in lk 2.4.19
# (sg version 3.1.24) and has been carried through into
# the 2.5 series. Thanks to Andy Polyakov
# <appro@fy.chalmers.se> for pointing this out (more than once).
# 
# The sg.h header didn't get updated last time I submitted
# an sg patch so this patch also addresses that.
# --------------------------------------------
# 03/05/30	greg@kroah.com	1.1046.196.1
# Merge kroah.com:/home/greg/linux/BK/bleed-2.5
# into kroah.com:/home/greg/linux/BK/gregkh-2.5
# --------------------------------------------
# 03/05/30	jejb@raven.il.steeleye.com	1.1046.190.8
# Automerge
# --------------------------------------------
# 03/05/30	jejb@raven.il.steeleye.com	1.1046.190.9
# Merge raven.il.steeleye.com:/home/jejb/BK/scsi-sg-2.5
# into raven.il.steeleye.com:/home/jejb/BK/scsi-misc-2.5
# --------------------------------------------
# 03/05/30	peter@chubb.wattle.id.au	1.1046.77.43
# [PATCH] ia64: use generic build infrastructure for generating offsets.h
# 
# Delete references to arch/ia64/tools; use standard sed script to generate
# offsets.h.
# 
# This gets the dependencies right for offsets.h
# --------------------------------------------
# 03/05/31	paulus@samba.org	1.1046.138.32
# Merge samba.org:/home/paulus/kernel/linux-2.5
# into samba.org:/home/paulus/kernel/for-linus-ppc
# --------------------------------------------
# 03/05/30	davidm@tiger.hpl.hp.com	1.1046.77.44
# .del-print_offsets.awk~ce325580e04f9929:
#   Delete: arch/ia64/tools/print_offsets.awk
# .del-Makefile~90bde6a95198c56c:
#   Delete: arch/ia64/tools/Makefile
# --------------------------------------------
# 03/05/30	peter@chubb.wattle.id.au	1.1046.15.42
# [PATCH] Fix ps/2 mouse and keyboard on I2000
# 
# I finally got sufficiently fed up to fix the PS/2 keyboard.  The
# problem is that the generic code requests an ISA interrupt directly,
# instead of via isa_irq_to_vector().
# --------------------------------------------
#
diff -Nru a/drivers/input/serio/i8042-io.h b/drivers/input/serio/i8042-io.h
--- a/drivers/input/serio/i8042-io.h	Mon Sep 22 13:04:30 2003
+++ b/drivers/input/serio/i8042-io.h	Mon Sep 22 13:04:30 2003
@@ -20,11 +20,14 @@
  */
 
 #ifdef __alpha__
-#define I8042_KBD_IRQ	1
-#define I8042_AUX_IRQ	(RTC_PORT(0) == 0x170 ? 9 : 12)	/* Jensen is special */
+# define I8042_KBD_IRQ	1
+# define I8042_AUX_IRQ	(RTC_PORT(0) == 0x170 ? 9 : 12)	/* Jensen is special */
+#elif defined(__ia64__)
+# define I8042_KBD_IRQ isa_irq_to_vector(1)
+# define I8042_AUX_IRQ isa_irq_to_vector(12)
 #else
-#define I8042_KBD_IRQ	1
-#define I8042_AUX_IRQ	12
+# define I8042_KBD_IRQ	1
+# define I8042_AUX_IRQ	12
 #endif
 
 /*